Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent missing resource errors if custom configuration is used without default location #545

Merged
merged 2 commits into from
May 20, 2015

Conversation

SteveMaddison
Copy link
Contributor

Could possibly be simplified by passing these four parameters directly to the resource definition for the default location.

@3flex
Copy link
Contributor

3flex commented Jan 9, 2015

@SteveMaddison would you be able to simplify as you suggested? We can merge as is but there's no reason to have the overrides here instead of setting the parameters directly on the default resource as you suggest.

@SteveMaddison
Copy link
Contributor Author

Sure, I thought I must've been overlooking something so just went for a minimal change. New commit pushed with all params going directly to the resource.

@3flex
Copy link
Contributor

3flex commented Jan 9, 2015

Actually this might need to be rebased after #529 is merged... I think @jfryman wants to hold off on changes to the code that will be affected.

@jfryman
Copy link
Contributor

jfryman commented Jan 12, 2015

Yeah, this will probably need to be re-based. I'm not traveling this week, so I'll aim to finish up #529 this week.

@3flex 3flex added the bug Something isn't working label Apr 15, 2015
@3flex
Copy link
Contributor

3flex commented Apr 16, 2015

@SteveMaddison could you rebase, and squash this to one commit? We'll get it merged.

@SteveMaddison
Copy link
Contributor Author

I Think that's it, have a good look. CI failed but it appears to be unrelated.

@3flex
Copy link
Contributor

3flex commented May 19, 2015

Looks good! And you're right, the CI issue isn't related.

Could you please squash it to a single commit to keep the history clean? There's a helpful guide here if you're not sure how to do it: https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history

…o resource.

Prevent missing resource errors if custom configuration is used without default location.
@SteveMaddison SteveMaddison force-pushed the default_location_fix branch from 7111389 to 62c8a1e Compare May 20, 2015 10:38
@SteveMaddison
Copy link
Contributor Author

Ended up resetting the branch but this looks like it has the same effect.

3flex added a commit that referenced this pull request May 20, 2015
Prevent missing resource errors if custom configuration is used without default location
@3flex 3flex merged commit f3d6fa5 into voxpupuli:master May 20, 2015
@3flex
Copy link
Contributor

3flex commented May 20, 2015

Looks much better, thanks for the code!

cegeka-jenkins pushed a commit to cegeka/puppet-nginx that referenced this pull request Oct 23, 2017
…ion_fix

Prevent missing resource errors if custom configuration is used without default location
slm0n87 pushed a commit to slm0n87/puppet-nginx that referenced this pull request Mar 7, 2019
…ion_fix

Prevent missing resource errors if custom configuration is used without default location
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants